-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove org users who belong to no teams #24247
Merged
silverwind
merged 7 commits into
go-gitea:main
from
yp05327:add-remove-org-user-check-if-team-deleted
Apr 24, 2023
Merged
Remove org users who belong to no teams #24247
silverwind
merged 7 commits into
go-gitea:main
from
yp05327:add-remove-org-user-check-if-team-deleted
Apr 24, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yp05327
changed the title
Add remove org user check if team is deleted
Remove the org user who belongs to no teams
Apr 21, 2023
yp05327
changed the title
Remove the org user who belongs to no teams
Remove org users who belong to no teams
Apr 21, 2023
techknowlogick
added
type/bug
outdated/backport/v1.19
This PR should be backported to Gitea 1.19
labels
Apr 21, 2023
pull-request-size
bot
added
the
size/S
Denotes a PR that changes 10-29 lines, ignoring generated files.
label
Apr 21, 2023
lunny
reviewed
Apr 21, 2023
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Apr 21, 2023
silverwind
reviewed
Apr 21, 2023
wxiaoguang
reviewed
Apr 24, 2023
@@ -419,6 +419,12 @@ func DeleteTeam(t *organization.Team) error { | |||
return err | |||
} | |||
|
|||
for _, tm := range t.Members { | |||
if err := removeInvalidOrgUser(ctx, tm.ID, t.OrgID); err != nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it mean that this "team member" doesn't belong to other teams in this org?
Hmm ... I see the logic in removeInvalidOrgUser
, it counts first.
wxiaoguang
approved these changes
Apr 24, 2023
silverwind
approved these changes
Apr 24, 2023
GiteaBot
added
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
and removed
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
labels
Apr 24, 2023
silverwind
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Apr 24, 2023
GiteaBot
removed
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Apr 24, 2023
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Apr 24, 2023
Fix go-gitea#24128 --------- Co-authored-by: silverwind <me@silverwind.io>
techknowlogick
pushed a commit
that referenced
this pull request
Apr 25, 2023
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Apr 25, 2023
* giteaofficial/main: default show closed actions list if all actions was closed (go-gitea#24234) [skip ci] Updated translations via Crowdin update nightly drone docker tag (go-gitea#24311) Remove org users who belong to no teams (go-gitea#24247) Fix typo in API route (go-gitea#24310) Add --font-weight-bold and set previous bold to 601 (go-gitea#24307) Mark `/templates/swagger/v1_json.tmpl` as generated file (go-gitea#24306) Improve External Wiki in Repo Header (go-gitea#24304) Unify nightly naming across binaries and docker images (go-gitea#24116) Wrap too long push mirror addresses (go-gitea#21120)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
backport/done
All backports for this PR have been created
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
outdated/backport/v1.19
This PR should be backported to Gitea 1.19
size/S
Denotes a PR that changes 10-29 lines, ignoring generated files.
type/bug
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #24128